Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 15 Jun 2010 11:40:23 +0000 (11:40 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 15 Jun 2010 11:40:23 +0000 (11:40 +0000)

Trivial merge